update upload_antigen

FFIB 2 年之前
父节点
当前提交
9f7121866d
共有 3 个文件被更改,包括 41 次插入2 次删除
  1. 4 0
      api/antigen_views.py
  2. 33 0
      equipment/migrations/0034_auto_20221227_1215.py
  3. 4 2
      equipment/models.py

+ 4 - 0
api/antigen_views.py

@@ -18,6 +18,8 @@ from utils.error.errno_utils import IsolationPointStatusCode
18 18
 def upload_antigen(request):
19 19
     unionid = request.POST.get('unionid', '')
20 20
     macid = request.POST.get('macid', '')
21
+    device_id = request.POST.get('device_id', '')
22
+    sn = request.POST.get('sn', '')
21 23
     user_name = request.POST.get('user_name', '')
22 24
     phone = request.POST.get('phone', 1)
23 25
     result = request.POST.get('result', 2)
@@ -38,6 +40,8 @@ def upload_antigen(request):
38 40
         point_id=user.point_id if user else '',
39 41
         user_id=user.user_id if user else '',
40 42
         macid=macid,
43
+        device_id=device_id,
44
+        sn=sn,
41 45
         user_name=user_name,
42 46
         phone=phone,
43 47
         result=result,

+ 33 - 0
equipment/migrations/0034_auto_20221227_1215.py

@@ -0,0 +1,33 @@
1
+# Generated by Django 3.2.6 on 2022-12-27 04:15
2
+
3
+from django.db import migrations, models
4
+
5
+
6
+class Migration(migrations.Migration):
7
+
8
+    dependencies = [
9
+        ('equipment', '0033_auto_20221226_1256'),
10
+    ]
11
+
12
+    operations = [
13
+        migrations.AddField(
14
+            model_name='antigenmeasureloginfo',
15
+            name='device_id',
16
+            field=models.CharField(blank=True, help_text='设备号', max_length=32, null=True, verbose_name='device_id'),
17
+        ),
18
+        migrations.AddField(
19
+            model_name='antigenmeasureloginfo',
20
+            name='sn',
21
+            field=models.CharField(blank=True, help_text='检测卡序列号', max_length=32, null=True, verbose_name='sn'),
22
+        ),
23
+        migrations.AlterField(
24
+            model_name='antigenmeasureloginfo',
25
+            name='macid',
26
+            field=models.CharField(blank=True, help_text='设备macid', max_length=32, null=True, verbose_name='macid'),
27
+        ),
28
+        migrations.AlterField(
29
+            model_name='antigenmeasureloginfo',
30
+            name='unionid',
31
+            field=models.CharField(blank=True, help_text='微信 Unionid', max_length=32, null=True, verbose_name='unionid'),
32
+        ),
33
+    ]

+ 4 - 2
equipment/models.py

@@ -550,9 +550,11 @@ class AntigenMeasureLogInfo(BaseModelMixin):
550 550
     point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
551 551
 
552 552
     user_id = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='用户唯一标识')
553
-    unionid = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='微信 Unionid')
553
+    unionid = models.CharField(_('unionid'), max_length=32, blank=True, null=True, help_text='微信 Unionid')
554 554
 
555
-    macid = models.CharField(_('macid'), max_length=32, blank=True, null=True, help_text='设备号')
555
+    macid = models.CharField(_('macid'), max_length=32, blank=True, null=True, help_text='设备macid')
556
+    device_id = models.CharField(_('device_id'), max_length=32, blank=True, null=True, help_text='设备号')
557
+    sn = models.CharField(_('sn'), max_length=32, blank=True, null=True, help_text='检测卡序列号')
556 558
     phone = models.CharField(_('phone'), max_length=11, blank=True, null=True, help_text='用户手机号')
557 559
     user_name = models.CharField(_('user_name'), max_length=255, blank=True, null=True, help_text='用户姓名')
558 560
     result = models.IntegerField(_('result'), choices=ANTIGEN_RESULT_TYPE, default=UNKNOWN, help_text='抗原检测结果')